Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 3 Mar 2006 14:56:34 +0000 (15:56 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 3 Mar 2006 14:56:34 +0000 (15:56 +0100)

Trivial merge